Revert "Use upstream default ${libexecdir} now that Debian Policy allows /usr/libexec...

This reverts commit 7f399162265eaf12e0d9299fad1b4b891a55587d.

diff --git a/debian/changelog b/debian/changelog
index 0944e4d68a333ea9a4500724f867870f39d31021..f81ad251e14553759012b6abbe342b415e35b904 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,5 @@
 ostree (2018.7-1) UNRELEASED; urgency=medium
 
-  * Use upstream default ${libexecdir} now that Debian Policy allows
-    /usr/libexec (via FHS 3.0)
   * Standards-Version: 4.1.5 (no changes required)
   * New upstream release
     - d/libostree-1-1.symbols: Update

diff --git a/debian/ostree-boot.install b/debian/ostree-boot.install
index 195e5d1d820249632c5121b9e34a61d38f2a4bbf..045b7383cf277db9ab377b6f98f554d736557037 100644 (file)
--- a/debian/ostree-boot.install
+++ b/debian/ostree-boot.install
@@ -5,7 +5,7 @@ lib/systemd/system/ostree-finalize-staged.service
 lib/systemd/system/ostree-prepare-root.service
 lib/systemd/system/ostree-remount.service
 usr/lib/dracut/modules.d/98ostree
+usr/lib/libostree/grub2-15_ostree
 usr/lib/ostree/ostree-prepare-root
 usr/lib/ostree/ostree-remount
 usr/lib/tmpfiles.d/ostree-tmpfiles.conf
-usr/libexec/libostree/grub2-15_ostree

diff --git a/debian/ostree-tests.install b/debian/ostree-tests.install
index 5ccecb3195a2f56cf0b76914ed2f2bbb8439800b..47ef14840db967d9c55847c7ffb1597d56b3bd3c 100644 (file)
--- a/debian/ostree-tests.install
+++ b/debian/ostree-tests.install
@@ -1,3 +1,3 @@
-usr/libexec/installed-tests/libostree
-usr/libexec/libostree/ostree-trivial-httpd
+usr/lib/installed-tests/libostree
+usr/lib/libostree/ostree-trivial-httpd
 usr/share/installed-tests/libostree

diff --git a/debian/ostree-tests.lintian-overrides b/debian/ostree-tests.lintian-overrides
index 87efd11db9c93dc9ec5031ded169452c5cd4a597..d565288089ee6053069e975d079c4881f1ca446d 100644 (file)
--- a/debian/ostree-tests.lintian-overrides
+++ b/debian/ostree-tests.lintian-overrides
@@ -1,14 +1,14 @@
 # This is deliberate: it's just some random signed file to be verified, and
 # upstream happens to have used the text of the LGPL as the signed file
-ostree-tests: extra-license-file usr/libexec/installed-tests/libostree/gpg-verify-data/lgpl2
-ostree-tests: extra-license-file usr/libexec/installed-tests/libostree/gpg-verify-data/lgpl2.sig
+ostree-tests: extra-license-file usr/lib/installed-tests/libostree/gpg-verify-data/lgpl2
+ostree-tests: extra-license-file usr/lib/installed-tests/libostree/gpg-verify-data/lgpl2.sig
 
 # This is deliberate, working around the assumption of recursive make
-ostree-tests: symlink-is-self-recursive usr/libexec/installed-tests/libostree/tests .
+ostree-tests: symlink-is-self-recursive usr/lib/installed-tests/libostree/tests .
 
 # We won't run this on sparc64 currently
-[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
+[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/lib/installed-tests/libostree/corrupt-repo-ref.js)
 
 # This shared object genuinely doesn't use any libc ABIs directly,
 # only via GLib
-library-not-linked-against-libc usr/libexec/installed-tests/libostree/libreaddir-rand.so
+library-not-linked-against-libc usr/lib/installed-tests/libostree/libreaddir-rand.so

diff --git a/debian/rules b/debian/rules
index 8012df44870903966e9b6bc122d3f7564369efc6..3f92293fc546b556fb8f848ffd78c74bace666f6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ endif
 
 override_dh_install:
        rm -f debian/tmp/usr/lib/*/*.la
-       rm -f debian/tmp/usr/libexec/installed-tests/libostree/*.la
+       rm -f debian/tmp/usr/lib/installed-tests/libostree/*.la
        :
        # TODO: when someone documents how to test these (#824649) they
        # should be installed in a new ostree-boot package: see
@@ -78,7 +78,7 @@ override_dh_install:
        rm -f debian/tmp/lib/systemd/system/ostree-prepare-root.service
        rm -f debian/tmp/lib/systemd/system/ostree-remount.service
        rm -fr debian/tmp/usr/lib/dracut/modules.d/98ostree/
-       rm -f debian/tmp/usr/libexec/libostree/grub2-15_ostree
+       rm -f debian/tmp/usr/lib/libostree/grub2-15_ostree
        rm -f debian/tmp/usr/lib/ostree/ostree-prepare-root
        rm -f debian/tmp/usr/lib/ostree/ostree-remount
        rm -f debian/tmp/usr/lib/tmpfiles.d/ostree-tmpfiles.conf